bitkeeper revision 1.1236.1.103 (423f2997yh5jfJbfPzgZOswMIKL-RA)
authorakw27@arcadians.cl.cam.ac.uk <akw27@arcadians.cl.cam.ac.uk>
Mon, 21 Mar 2005 20:07:51 +0000 (20:07 +0000)
committerakw27@arcadians.cl.cam.ac.uk <akw27@arcadians.cl.cam.ac.uk>
Mon, 21 Mar 2005 20:07:51 +0000 (20:07 +0000)
commit2c9dea7c1b2247bbaa55f97d86417832a422e150
treeb87a1fd49f5cc9acdaa8ad84ad09ee1076bf4690
parent67e1adab52e84ae097dfacc4efac67d817590900
parentd4282ab308d880580089973ca9a8ab804edd7e22
bitkeeper revision 1.1236.1.103 (423f2997yh5jfJbfPzgZOswMIKL-RA)

manual merge of James's stuff.
.rootkeys
tools/blktap/Makefile
tools/blktap/blockstore.c
tools/blktap/blockstore.h